git rerere
reuse recorded resolution
conflictの修正の自動化
https://git-scm.com/book/ja/v2/Git-のさまざまなツール-Rerere
https://qiita.com/usamik26/items/00208bbcde31fcde9117